fix(amazonq): Bug fixes for LSP auth on agentic mode #7231
Conversation
|
| if ( | ||
| (Experiments.instance.get('amazonqLSP', true) || AuthUtil.instance.isInternalAmazonUser()) && | ||
| (!isAmazonInternalOs() || (await hasGlibcPatch())) | ||
| ) { | ||
| // start the Amazon Q LSP for internal users first | ||
| // for AL2, start LSP if glibc patch is found | ||
| await activateAmazonqLsp(context) | ||
| } |
There was a problem hiding this comment.
This setup doesn't work with auth on LSP, since the LSP needs to start for auth to work
| context.subscriptions.push(amazonq.focusAmazonQPanel.register(), amazonq.focusAmazonQPanelKeybinding.register()) | ||
|
|
There was a problem hiding this comment.
Now part of
| const installResult = await new AmazonQLspInstaller().resolve() | ||
| return await lspSetupStage('launch', () => startLanguageServer(ctx, installResult.resourcePaths)) | ||
| }) | ||
| AuthUtil.create(new auth2.LanguageClientAuth(client, clientId, encryptionKey)) |
There was a problem hiding this comment.
Move instantiation of the AuthUtil singleton into startLanguageServer. The function uses several AuthUtil calls, which fail if it is not instantiated yet
| if (uri.scheme.startsWith('http')) { | ||
| try { | ||
| await openUrl(vscode.Uri.parse(params.uri)) | ||
| return params | ||
| } catch (err: any) { | ||
| getLogger().error(`Failed to open http from LSP: error: %s`, err) | ||
| } | ||
| } |
There was a problem hiding this comment.
This functionality was added to enable LSP to open documents in agentic chat. We were relying on the same request type to open the auth URL we receive from LSP in the login flow
| if (!this.isConnected()) { | ||
| await this.refreshState() | ||
| } |
There was a problem hiding this comment.
This ensures that a session is restored successfully upon start of the extension with expired SSO. If SSO is expired upon start of extension, the LSP throws an error. Since there is no state change in that case (notConnected > notConnected), we can't rely on the state change handler to trigger a login flow
opieter-aws
changed the title
opieter-aws
changed the title
|
| notifications: true, | ||
| showSaveFileDialog: true, | ||
| }, | ||
| q: { |
There was a problem hiding this comment.
I don't think this can be dropped
There was a problem hiding this comment.
The merge with mainline made it duplicate, see line 140
opieter-aws
merged commit 8787af3
into
aws:feature/amazonqLSP-auth
2 participants
Problem
Agentic chat introduced code changes that break auth on LSP
Solution
Fixes for the auth flow:
AuthUtilintostartLanguageServersinc ethe function uses several AuthUtil calls, which fail if it is not instantiated yetShowDocumentRequesthandler, and remove the old handler fromclient.ts.feature/xbranches will not be squash-merged at release time.